home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Collection of Internet
/
Collection of Internet.iso
/
infosrvr
/
dev
/
tkwww_0_.pat
< prev
next >
Wrap
Text File
|
1993-12-13
|
32KB
|
1,112 lines
diff -c WWW/TkWWW/Makefile.in:1.1 WWW/TkWWW/Makefile.in:1.3
*** WWW/TkWWW/Makefile.in:1.1 Mon Dec 13 20:06:09 1993
--- WWW/TkWWW/Makefile.in Mon Dec 13 20:06:09 1993
***************
*** 1,5 ****
! # Master Makefile for the GNU file utilities.
! # Copyright (C) 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
--- 1,4 ----
! # Master Makefile for tkWWW
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
***************
*** 20,32 ****
srcdir = @srcdir@
VPATH = @srcdir@
- # If you use gcc, you should either run the fixincludes script that
- # comes with it or else use gcc with the -traditional option. Otherwise
- # ioctl calls will be compiled incorrectly on some systems.
CC = @CC@
CPP = @CPP@
AR = ar
- # Set RANLIB = echo if your system doesn't have or need ranlib.
RANLIB = @RANLIB@
DEFS = @DEFS@
--- 19,30 ----
srcdir = @srcdir@
VPATH = @srcdir@
CC = @CC@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+
CPP = @CPP@
AR = ar
RANLIB = @RANLIB@
DEFS = @DEFS@
***************
*** 89,96 ****
-DCPP_TK_WWW_MAIL=@TK_WWW_MAIL@ \
-DCPP_TK_WWW_TK_CMD=$(bindir)/@tk_www_tk_executable@
! Tcl/tkWWW:: Tcl/tkWWW.cpp
! $(CPP) $(CPP_DEFINES) - < Tcl/tkWWW.cpp | \
sed -e '/^# *[0-9][0-9]* *.*$$/d' \
-e '/^XCOMM$$/s//#/' \
-e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/#/' >$@
--- 87,94 ----
-DCPP_TK_WWW_MAIL=@TK_WWW_MAIL@ \
-DCPP_TK_WWW_TK_CMD=$(bindir)/@tk_www_tk_executable@
! $(srcdir)/Tcl/tkWWW:: $(srcdir)/Tcl/tkWWW.cpp
! $(CPP) $(CPP_DEFINES) - < $(srcdir)/Tcl/tkWWW.cpp | \
sed -e '/^# *[0-9][0-9]* *.*$$/d' \
-e '/^XCOMM$$/s//#/' \
-e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/#/' >$@
***************
*** 103,126 ****
check:
installcheck:
! Makefile: config.status $(srcdir)/Makefile.in $(srcdir)/lib/Makefile.in \
! $(srcdir)/man/Makefile.in $(srcdir)/src/Makefile.in
$(SHELL) config.status
# Make sure all installation directories, e.g. $(bindir) actually exist by
# making them if necessary.
installdirs:
$(SHELL) $(srcdir)/mkinstalldirs \
$(bindir) $(datadir) $(libdir) $(infodir) $(mandir)
! install:: installdirs
! install uninstall TAGS clean mostlyclean distclean realclean::
for dir in $(SUBDIRS); do \
echo making $@ in $$dir ; \
(cd $$dir; $(MAKE) $(MDEFINES) $@) ; \
done
distclean realclean::
rm -f Makefile config.status
--- 101,134 ----
check:
installcheck:
! Makefile: config.status $(srcdir)/Makefile.in $(srcdir)/Server/Makefile.in \
! $(srcdir)/Library/Makefile.in
$(SHELL) config.status
# Make sure all installation directories, e.g. $(bindir) actually exist by
# making them if necessary.
+
installdirs:
$(SHELL) $(srcdir)/mkinstalldirs \
$(bindir) $(datadir) $(libdir) $(infodir) $(mandir)
! install:: installdirs $(srcdir)/Tcl/tkWWW
! for dir in $(SUBDIRS); do \
! echo making $@ in $$dir ; \
! (cd $$dir; $(MAKE) $(MDEFINES) $@) ; \
! done
! $(INSTALL_PROGRAM) $(srcdir)/Tcl/tkWWW $(bindir)/tkWWW
! uninstall TAGS clean mostlyclean distclean realclean::
for dir in $(SUBDIRS); do \
echo making $@ in $$dir ; \
(cd $$dir; $(MAKE) $(MDEFINES) $@) ; \
done
+ clean::
+ rm -f $(srcdir)/Tcl/tkWWW
+
+
distclean realclean::
rm -f Makefile config.status
***************
*** 142,156 ****
# Prevent GNU make v3 from overflowing arg limit on SysV.
.NOEXPORT:
-
- .cpp.tcl:
- $(CPP) $(CPP_DEFINES) - < $< | \
- sed -e '/^# *[0-9][0-9]* *.*$$/d' \
- -e '/^XCOMM$$/s//#/' \
- -e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/#/' >$@
-
- clean::
- rm -f $(TK_WWW_PROCESS_CODE) tkWWW
-
- install:: tkWWW.script
- $(INSTALL) -c $(INSTSCRFLAGS) tkWWW.script $(BINDIR)/tkWWW
--- 150,152 ----
diff -c WWW/TkWWW/README.txt:1.12 WWW/TkWWW/README.txt:1.13
*** WWW/TkWWW/README.txt:1.12 Mon Dec 13 20:06:10 1993
--- WWW/TkWWW/README.txt Mon Dec 13 20:06:10 1993
***************
*** 1,4 ****
! tkWWW Version 0.9 beta (joe@athena.mit.edu)
--------------------------------------------
WHAT IS THIS?
-------------
--- 1,4 ----
! tkWWW Version 0.10 beta (joe@athena.mit.edu)
--------------------------------------------
WHAT IS THIS?
-------------
***************
*** 14,29 ****
Since the entire user interface is written in an interpreted language,
it is very easy to make modifications and extensions to the system.
tkWWW is the first X11 browser with the ability to edit HTML!!!!!
-
- What has changed since 0.8?
- ---------------------------
- * Much better editing user interface
- Thanks to creilly@maths.tcd.ie and jay@bogle.eitech.com
- * Recognition of character style tags
- * Partial support for IMAGE tags
- * Compatibility with TCL 7.0
- * Compatibility with old HTTP servers
-
To Install
----------
--- 14,19 ----
diff -c WWW/TkWWW/configure:1.2 WWW/TkWWW/configure:1.4
*** WWW/TkWWW/configure:1.2 Mon Dec 13 20:06:11 1993
--- WWW/TkWWW/configure Mon Dec 13 20:06:11 1993
***************
*** 142,147 ****
--- 142,163 ----
tk_www_start_page=$tk_www_home_page
+ if test -z "$prefix"
+ then
+ echo checking for wish to derive installation directory prefix
+ IFS="${IFS= }"; saveifs="$IFS"; IFS="$IFS:"
+ for dir in $PATH; do
+ test -z "$dir" && dir=.
+ if test $dir != . && test -f $dir/wish; then
+ # Not all systems have dirname.
+ prefix=`echo $dir|sed 's%/[^/][^/]*$%%'`
+ break
+ fi
+ done
+ IFS="$saveifs"
+ echo " chose installation directory prefix ${prefix}"
+ fi
+
if test -z "$CC"; then
# Extract the first word of `gcc', so it can be a program name with args.
set dummy gcc; word=$2
***************
*** 280,286 ****
# Run xmkmf to check for location of X libraries and includes
#
! # If we find X, set shell vars x_includes and x_libraries to the paths.
no_x=true
echo checking for X include and library files with xmkmf
rm -fr conftestdir
--- 296,320 ----
# Run xmkmf to check for location of X libraries and includes
#
! if test -z "$tk_ok"; then
! # Extract the first word of `xmkmf', so it can be a program name with args.
! set dummy xmkmf; word=$2
! echo checking for $word
! IFS="${IFS= }"; saveifs="$IFS"; IFS="${IFS}:"
! for dir in $PATH; do
! test -z "$dir" && dir=.
! if test -f $dir/$word; then
! tk_ok="1"
! break
! fi
! done
! IFS="$saveifs"
! fi
! test -z "$tk_ok" && tk_ok="0"
! test -n "$tk_ok" && test -n "$verbose" && echo " setting tk_ok to $tk_ok"
!
! if test $tk_ok = 1; then
! # If we find X, set shell vars x_includes and x_libraries to the paths.
no_x=true
echo checking for X include and library files with xmkmf
rm -fr conftestdir
***************
*** 395,405 ****
--- 429,540 ----
test -n "$x_includes" && echo " found X11 headers in $x_includes"
test -n "$x_libraries" && echo " found X11 libraries in $x_libraries"
fi
+ fi
+ if test "$x_includes" = /usr/include; then
+ XINCLUDES="# no special path needed"
+ elif test "$x_includes" != ""; then
+ XINCLUDES=" -I$x_includes"
+ else
+ echo checking for X11 header files
+ XINCLUDES="# no special path needed"
+ cat > conftest.c <<EOF
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ EOF
+ err=`eval "($CPP conftest.c >/dev/null) 2>&1"`
+ if test -z "$err"; then
+ :
+ else
+ rm -rf conftest*
+ XINCLUDES="nope"
+ fi
+ rm -f conftest*
+ if test "$XINCLUDES" = nope; then
+ dirs=${XINCLUDE_DIR-"/usr/unsupported/include /usr/local/include /usr/X386/include /usr/include/X11R4 /usr/X11R5/include /usr/include/X11R5 /usr/openwin/include /usr/X11/include"}
+ for i in $dirs ; do
+ if test -r $i/X11/Intrinsic.h; then
+ XINCLUDES=" -I$i"
+ fi
+ done
+ fi
+ fi
+ if test "$XINCLUDES" = nope; then
+ echo "Warning: couldn't find any X11 include files."
+ XINCLUDES="# no include files found"
+ fi
+ if test "$x_libraries" = /usr/lib; then
+ XLIBSW=-lX11
+ elif test "$x_libraries" != ""; then
+ XLIBSW="-L$x_libraries -lX11"
+ else
+ echo "checking for X11 library archive"
+ LIBS_save="${LIBS}"
+ LIBS="${LIBS} -lX11"
+ have_lib=""
+ echo checking for -lX11
+ cat > conftest.c <<EOF
+ #include "confdefs.h"
+ int main() { exit(0); }
+ int t() { main(); }
+ EOF
+ if eval $compile; then
+ rm -rf conftest*
+ have_lib="1"
+ fi
+ rm -f conftest*
+ LIBS="${LIBS_save}"
+ if test -n "${have_lib}"; then
+ :; XLIBSW="-lX11"
+ else
+ :; XLIBSW=nope
+ fi
+ if test "$XLIBSW" = nope; then
+ dirs=${XLIBRARY_DIR-"/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/lib/X11R4 /usr/X11R5/lib /usr/lib/X11R5 /usr/openwin/lib /usr/X11/lib"}
+ for i in $dirs ; do
+ if test -r $i/libX11.a; then
+ XLIBSW="-L$i -lX11"
+ fi
+ done
+ fi
+ fi
+ if test "$XLIBSW" = nope ; then
+ LIBS_save="${LIBS}"
+ LIBS="${LIBS} -lXwindow"
+ have_lib=""
+ echo checking for -lXwindow
+ cat > conftest.c <<EOF
+ #include "confdefs.h"
+
+ int main() { exit(0); }
+ int t() { main(); }
+ EOF
+ if eval $compile; then
+ rm -rf conftest*
+ have_lib="1"
+
+ fi
+ rm -f conftest*
+ LIBS="${LIBS_save}"
+ if test -n "${have_lib}"; then
+ :; XLIBSW=-lXwindow
+ else
+ :;
+ fi
+
+ fi
+ if test "$XLIBSW" = nope ; then
+ echo "Warning: couldn't find the X11 library archive. Using -lX11."
+ XLIBSW=-lX11
+ fi
+
+
+
+
#
# This is to substitute extra paths that
#
***************
*** 601,629 ****
#
LIBS_save="${LIBS}"
- LIBS="${LIBS} -lbsdmalloc"
- have_lib=""
- echo checking for -lbsdmalloc
- cat > conftest.c <<EOF
- #include "confdefs.h"
-
- int main() { exit(0); }
- int t() { main(); }
- EOF
- if eval $compile; then
- rm -rf conftest*
- have_lib="1"
-
- fi
- rm -f conftest*
- LIBS="${LIBS_save}"
- if test -n "${have_lib}"; then
- :; LIBS="$LIBS -lbsdmalloc"
- else
- :;
- fi
-
- LIBS_save="${LIBS}"
LIBS="${LIBS} -lelf"
have_lib=""
echo checking for -lelf
--- 736,741 ----
***************
*** 743,750 ****
CPP='$CPP'
RANLIB='$RANLIB'
TK_WWW_MAIL='$TK_WWW_MAIL'
! x_includes='$x_includes'
! x_libraries='$x_libraries'
tk_www_extra_path='$tk_www_extra_path'
tk_www_tk_executable='$tk_www_tk_executable'
TCL_INCDIR='$TCL_INCDIR'
--- 855,863 ----
CPP='$CPP'
RANLIB='$RANLIB'
TK_WWW_MAIL='$TK_WWW_MAIL'
! tk_ok='$tk_ok'
! XINCLUDES='$XINCLUDES'
! XLIBSW='$XLIBSW'
tk_www_extra_path='$tk_www_extra_path'
tk_www_tk_executable='$tk_www_tk_executable'
TCL_INCDIR='$TCL_INCDIR'
***************
*** 787,794 ****
s%@CPP@%$CPP%g
s%@RANLIB@%$RANLIB%g
s%@TK_WWW_MAIL@%$TK_WWW_MAIL%g
! s%@x_includes@%$x_includes%g
! s%@x_libraries@%$x_libraries%g
s%@tk_www_extra_path@%$tk_www_extra_path%g
s%@tk_www_tk_executable@%$tk_www_tk_executable%g
s%@TCL_INCDIR@%$TCL_INCDIR%g
--- 900,908 ----
s%@CPP@%$CPP%g
s%@RANLIB@%$RANLIB%g
s%@TK_WWW_MAIL@%$TK_WWW_MAIL%g
! s%@tk_ok@%$tk_ok%g
! s%@XINCLUDES@%$XINCLUDES%g
! s%@XLIBSW@%$XLIBSW%g
s%@tk_www_extra_path@%$tk_www_extra_path%g
s%@tk_www_tk_executable@%$tk_www_tk_executable%g
s%@TCL_INCDIR@%$TCL_INCDIR%g
***************
*** 806,817 ****
EOF
chmod +x config.status
${CONFIG_SHELL-/bin/sh} config.status
-
-
-
-
-
-
-
-
--- 920,923 ----
diff -c WWW/TkWWW/configure.in:1.2 WWW/TkWWW/configure.in:1.4
*** WWW/TkWWW/configure.in:1.2 Mon Dec 13 20:06:12 1993
--- WWW/TkWWW/configure.in Mon Dec 13 20:06:12 1993
***************
*** 15,20 ****
--- 15,22 ----
tk_www_start_page=$tk_www_home_page
AC_SUBST(tk_www_start_page)
+ dnl Guess prefix
+ AC_PREFIX(wish)
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_CPP
***************
*** 30,39 ****
# Run xmkmf to check for location of X libraries and includes
#
! AC_FIND_X
! AC_SUBST(x_includes)
! AC_SUBST(x_libraries)
define(AC_FIND_PROG_PATH,
[echo checking for path of $1
IFS="${IFS= }"; saveifs="$IFS"; IFS="$IFS:"
--- 32,89 ----
# Run xmkmf to check for location of X libraries and includes
#
! AC_PROGRAM_CHECK(tk_ok, xmkmf, 1, 0)
! if test $tk_ok = 1; then
! AC_FIND_X
! fi
! if test "$x_includes" = /usr/include; then
! XINCLUDES="# no special path needed"
! elif test "$x_includes" != ""; then
! XINCLUDES=" -I$x_includes"
! else
! echo checking for X11 header files
! XINCLUDES="# no special path needed"
! AC_TEST_CPP([#include <X11/Intrinsic.h>], , XINCLUDES="nope")
! if test "$XINCLUDES" = nope; then
! dirs=${XINCLUDE_DIR-"/usr/unsupported/include /usr/local/include /usr/X386/include /usr/include/X11R4 /usr/X11R5/include /usr/include/X11R5 /usr/openwin/include /usr/X11/include"}
! for i in $dirs ; do
! if test -r $i/X11/Intrinsic.h; then
! XINCLUDES=" -I$i"
! fi
! done
! fi
! fi
! if test "$XINCLUDES" = nope; then
! echo "Warning: couldn't find any X11 include files."
! XINCLUDES="# no include files found"
! fi
! AC_SUBST(XINCLUDES)
+ if test "$x_libraries" = /usr/lib; then
+ XLIBSW=-lX11
+ elif test "$x_libraries" != ""; then
+ XLIBSW="-L$x_libraries -lX11"
+ else
+ echo "checking for X11 library archive"
+ AC_HAVE_LIBRARY(X11, XLIBSW="-lX11", XLIBSW=nope)
+ if test "$XLIBSW" = nope; then
+ dirs=${XLIBRARY_DIR-"/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/lib/X11R4 /usr/X11R5/lib /usr/lib/X11R5 /usr/openwin/lib /usr/X11/lib"}
+ for i in $dirs ; do
+ if test -r $i/libX11.a; then
+ XLIBSW="-L$i -lX11"
+ fi
+ done
+ fi
+ fi
+ if test "$XLIBSW" = nope ; then
+ AC_HAVE_LIBRARY(Xwindow, XLIBSW=-lXwindow)
+ fi
+ if test "$XLIBSW" = nope ; then
+ echo "Warning: couldn't find the X11 library archive. Using -lX11."
+ XLIBSW=-lX11
+ fi
+ AC_SUBST(XLIBSW)
+
define(AC_FIND_PROG_PATH,
[echo checking for path of $1
IFS="${IFS= }"; saveifs="$IFS"; IFS="$IFS:"
***************
*** 174,190 ****
# Add special libraries for solaris
#
- AC_HAVE_LIBRARY(bsdmalloc, [LIBS="$LIBS -lbsdmalloc"])
AC_HAVE_LIBRARY(elf, [LIBS="$LIBS -lelf"])
AC_HAVE_LIBRARY(socket, [LIBS="$LIBS -lsocket"])
AC_HAVE_LIBRARY(nsl, [LIBS="$LIBS -lnsl"])
AC_OUTPUT(Makefile Server/Makefile Library/Makefile)
-
-
-
-
-
-
-
-
--- 224,231 ----
diff -c /dev/null WWW/TkWWW/mkinstalldirs:1.1
*** /dev/null Mon Dec 13 20:06:12 1993
--- WWW/TkWWW/mkinstalldirs Mon Dec 13 20:06:12 1993
***************
*** 0 ****
--- 1,35 ----
+ #!/bin/sh
+ # Make directory hierarchy.
+ # Written by Noah Friedman <friedman@prep.ai.mit.edu>
+ # Public domain.
+
+ defaultIFS='
+ '
+ IFS="${IFS-${defaultIFS}}"
+
+ errstatus=0
+
+ for file in ${1+"$@"} ; do
+ oIFS="${IFS}"
+ # Some sh's can't handle IFS=/ for some reason.
+ IFS='%'
+ set - `echo ${file} | sed -e 's@/@%@g' -e 's@^%@/@'`
+ IFS="${oIFS}"
+
+ pathcomp=''
+
+ for d in ${1+"$@"} ; do
+ pathcomp="${pathcomp}${d}"
+
+ if test ! -d "${pathcomp}"; then
+ echo "mkdir $pathcomp" 1>&2
+ mkdir "${pathcomp}" || errstatus=$?
+ fi
+
+ pathcomp="${pathcomp}/"
+ done
+ done
+
+ exit $errstatus
+
+ # eof
diff -c WWW/TkWWW/Library/Makefile.in:1.1 WWW/TkWWW/Library/Makefile.in:1.2
*** WWW/TkWWW/Library/Makefile.in:1.1 Mon Dec 13 20:06:22 1993
--- WWW/TkWWW/Library/Makefile.in Mon Dec 13 20:06:22 1993
***************
*** 171,181 ****
# Install W3 library into system space (not normally necessary)
! install : libwww.a
if [ ! -r $(LIBDIR) ] mkdir $(LIBDIR)
cp libwww.a $(LIBDIR)/libwww.a
! uninstall :
$(RM) $(LIBDIR)/libwww.a
# Distribution use only:
--- 171,183 ----
# Install W3 library into system space (not normally necessary)
! install:
!
! installlib : libwww.a
if [ ! -r $(LIBDIR) ] mkdir $(LIBDIR)
cp libwww.a $(LIBDIR)/libwww.a
! uninstalllib :
$(RM) $(LIBDIR)/libwww.a
# Distribution use only:
diff -c WWW/TkWWW/Server/HText.c:1.2 WWW/TkWWW/Server/HText.c:1.3
*** WWW/TkWWW/Server/HText.c:1.2 Mon Dec 13 20:06:26 1993
--- WWW/TkWWW/Server/HText.c Mon Dec 13 20:06:26 1993
***************
*** 131,137 ****
char *cmd_start;
cmd_start = text->output->data + text->execute_pointer;
! text->output->data[text->output->size] = '\0';
if (Tcl_CommandComplete(cmd_start)) {
text->execute_pointer = text->output->size;
value = Tcl_Eval(HtTclInterp, cmd_start);
--- 131,139 ----
char *cmd_start;
cmd_start = text->output->data + text->execute_pointer;
! /* never access directly, it crash when chunk is just full
! use that instead : -- dl */
! HTChunkPutc(text->output,0) ;
if (Tcl_CommandComplete(cmd_start)) {
text->execute_pointer = text->output->size;
value = Tcl_Eval(HtTclInterp, cmd_start);
diff -c WWW/TkWWW/Server/Makefile.in:1.1 WWW/TkWWW/Server/Makefile.in:1.2
*** WWW/TkWWW/Server/Makefile.in:1.1 Mon Dec 13 20:06:27 1993
--- WWW/TkWWW/Server/Makefile.in Mon Dec 13 20:06:27 1993
***************
*** 20,35 ****
# Where to install the executable.
bindir = $(exec_prefix)/bin
! INCLUDES = -I. \
! -I@TCL_INCDIR@ -I@TK_INCDIR@ \
! -I@x_includes@ -I../../Library/Implementation
CFLAGS= $(CDEBUGFLAGS) $(DEFINES) $(INCLUDES)
! LIBS=../Library/libwww.a \
! -L@x_libraries@ -lX11 \
! -L@TK_LIBDIR@ -ltk \
! -L@TCL_LIBDIR@ -ltcl @LIBS@ -lX11 -lm
TEST_LIBS=@TCL_LIBDIR@ -ltcl -lm
--- 20,36 ----
# Where to install the executable.
bindir = $(exec_prefix)/bin
! XINCLUDES = @XINCLUDES@
! XLIBSW = @XLIBSW@
+
+ INCLUDES = -I. -I@TCL_INCDIR@ -I@TK_INCDIR@ \
+ $(XINCLUDES) -I../../Library/Implementation
+
CFLAGS= $(CDEBUGFLAGS) $(DEFINES) $(INCLUDES)
! LIBS=../Library/libwww.a -L@TK_LIBDIR@ -ltk -L@TCL_LIBDIR@ -ltcl \
! $(XLIBSW) @LIBS@ -lm
TEST_LIBS=@TCL_LIBDIR@ -ltcl -lm
diff -c WWW/TkWWW/Tcl/bookmarks.tcl:1.14 WWW/TkWWW/Tcl/bookmarks.tcl:1.15
*** WWW/TkWWW/Tcl/bookmarks.tcl:1.14 Mon Dec 13 20:06:34 1993
--- WWW/TkWWW/Tcl/bookmarks.tcl Mon Dec 13 20:06:35 1993
***************
*** 36,41 ****
--- 36,42 ----
tkW3OutputMakeButtons $w.button_frame {
{current "Add current" "tkW3BookmarksAdd"}
{goto "Go To" "tkW3BookmarksGotoSelected"}
+ {clone "Clone" "tkW3BookmarksGotoSelected 1"}
{remove "Remove" "tkW3BookmarksDeleteSelected"}
{edit "Edit Title" "tkW3BookmarksEditTitle"}
}
***************
*** 54,67 ****
%W select from \[%W nearest %y\]
tkW3BookmarksGotoSelected"
DLG:show $parent $w
}
! proc tkW3BookmarksGotoSelected {} {
global tkW3Bookmarks
! tkW3NavigateRecordAndGoto [ \
lindex [lindex $tkW3Bookmarks(list) \
[DLG:get_listbox_highlighted .bookmarks]] 1]
}
proc tkW3BookmarksDeleteSelected {} {
--- 55,78 ----
%W select from \[%W nearest %y\]
tkW3BookmarksGotoSelected"
+ bind $w.list <Double-2> "$w.button_frame.clone flash
+ %W select from \[%W nearest %y\]
+ tkW3BookmarksGotoSelected 1"
+
DLG:show $parent $w
}
! proc tkW3BookmarksGotoSelected {{clone 0}} {
global tkW3Bookmarks
! set address [ \
lindex [lindex $tkW3Bookmarks(list) \
[DLG:get_listbox_highlighted .bookmarks]] 1]
+
+ if {$clone} {
+ tkW3NavigateClone $address
+ } {
+ tkW3NavigateRecordAndGoto $address
+ }
}
proc tkW3BookmarksDeleteSelected {} {
***************
*** 72,78 ****
--- 83,109 ----
tkW3BookmarksSave
}
+ proc tkW3BookmarksEditTitle {} {
+ global tkW3Bookmarks
+ set i [DLG:get_listbox_highlighted .bookmarks]
+ set title [lindex [lindex $tkW3Bookmarks(list) $i] 0]
+ DLG:entry . .edit_dialog "Bookmark title" \
+ {"Title:"} "Edit" "tkW3BookmarksDoEditTitle $i"
+ DLG:set_entry_value .edit_dialog 1 $title
+ DLG:show . .edit_dialog
+ }
+
+ proc tkW3BookmarksDoEditTitle {i title} {
+ global tkW3Bookmarks
+ set address [lindex [lindex $tkW3Bookmarks(list) $i] 1]
+ set tkW3Bookmarks(list) \
+ [lreplace $tkW3Bookmarks(list) $i $i [list $title $address]]
+ .bookmarks.list delete $i
+ .bookmarks.list insert $i $title
+ tkW3BookmarksSave
+ }
+
## tkW3BookmarksAdd: Add a bookmark
## -----------
## Arguments
***************
*** 96,105 ****
if {[winfo exists .bookmarks.list]} {
.bookmarks.list insert end $title
}
- }
-
- proc tkW3BookmarksDelete {} {
- tkW3HelpNotAvailable
}
# Load bookmarks from file
--- 127,132 ----
diff -c WWW/TkWWW/Tcl/edit.generate.tcl:1.2 WWW/TkWWW/Tcl/edit.generate.tcl:1.3
*** WWW/TkWWW/Tcl/edit.generate.tcl:1.2 Mon Dec 13 20:06:35 1993
--- WWW/TkWWW/Tcl/edit.generate.tcl Mon Dec 13 20:06:35 1993
***************
*** 67,73 ****
tkW3EditConvertLineItems $w
set delimit_tags {
{ADDRESS "\n<ADDRESS>" "\n</ADDRESS>"}
! {PRE "<PRE>\n" "</PRE>\n"}
{CODE "<CODE>" "</CODE>"}
{TT "<TT>" "</TT>"}
{B "<B>" "</B>"}
--- 67,73 ----
tkW3EditConvertLineItems $w
set delimit_tags {
{ADDRESS "\n<ADDRESS>" "\n</ADDRESS>"}
! {PRE "\n<PRE>" "\n</PRE>"}
{CODE "<CODE>" "</CODE>"}
{TT "<TT>" "</TT>"}
{B "<B>" "</B>"}
diff -c WWW/TkWWW/Tcl/edit.tcl:1.16 WWW/TkWWW/Tcl/edit.tcl:1.17
*** WWW/TkWWW/Tcl/edit.tcl:1.16 Mon Dec 13 20:06:36 1993
--- WWW/TkWWW/Tcl/edit.tcl Mon Dec 13 20:06:36 1993
***************
*** 80,86 ****
{ispell_text .edit.main.t}
set button_list {
{generate "Generate Source" "tkW3EditGenerate"}
! {save "Save" "tkW3EditSave"}
{close "Close Window" "tkW3EditClose"}
}
pack append .edit \
--- 80,86 ----
{ispell_text .edit.main.t}
set button_list {
{generate "Generate Source" "tkW3EditGenerate"}
! {save "Save As..." "tkW3EditSave"}
{close "Close Window" "tkW3EditClose"}
}
pack append .edit \
***************
*** 340,346 ****
## Save Generated HTML to a file
## ********************
! proc tkW3EditSave {} {
global fsBox
set list [split [tkW3NavigateGetAddress] ":"]
set type [lindex $list 0]
--- 340,346 ----
## Save Generated HTML to a file
## ********************
! proc tkW3EditSave {{no_prompt 0}} {
global fsBox
set list [split [tkW3NavigateGetAddress] ":"]
set type [lindex $list 0]
***************
*** 351,356 ****
--- 351,361 ----
if {"$type" == "file" && ![string match $name "//*"]} {
set fsBox(path) [file dirname $name]
set file [file tail $name]
+ if {$no_prompt != 0} {
+ tkW3EditClose
+ tkW3EditOutputHTML $fsBox(path)/$file
+ return
+ }
}
tkW3EditClose
***************
*** 372,378 ****
}
}
if {[catch "open $filename w" file] != 0} {
! DLG:error . .error "couldn't open $filename for writing" "OK"
return
}
puts $file [.edit.main.t get 1.0 end]
--- 377,383 ----
}
}
if {[catch "open $filename w" file] != 0} {
! tkW3OutputError "couldn't open $filename for writing"
return
}
puts $file [.edit.main.t get 1.0 end]
***************
*** 576,578 ****
--- 581,588 ----
DLG:set_entry_value .image_dialog 1 $tkW3HtPage(image.$i)
DLG:show . .image_dialog
}
+
+ ## *********************
+ ## Procedures dealing with RCS
+ ## *********************
+
diff -c WWW/TkWWW/Tcl/file.tcl:1.14 WWW/TkWWW/Tcl/file.tcl:1.15
*** WWW/TkWWW/Tcl/file.tcl:1.14 Mon Dec 13 20:06:37 1993
--- WWW/TkWWW/Tcl/file.tcl Mon Dec 13 20:06:37 1993
***************
*** 49,54 ****
--- 49,63 ----
DLG:show . .fsBox
}
+
+ proc tkW3FileSave {} {
+ tkW3EditOpen 0
+ tkW3EditCopyText .f.msg .edit.main.t
+ tkW3EditCopyTags .f.msg .edit.main.t
+ tkW3EditConvertToHTML .edit.main.t
+ tkW3EditSave 1
+ }
+
proc tkW3FileSaveAs {} {
tkW3EditOpen 0
tkW3EditCopyText .f.msg .edit.main.t
diff -c WWW/TkWWW/Tcl/help.tcl:1.10 WWW/TkWWW/Tcl/help.tcl:1.11
*** WWW/TkWWW/Tcl/help.tcl:1.10 Mon Dec 13 20:06:37 1993
--- WWW/TkWWW/Tcl/help.tcl Mon Dec 13 20:06:37 1993
***************
*** 19,25 ****
DLG:toplevel . $w
DLG:draw_entries $w {To: Subject:}
! DLG:set_entry_value $w 1 "tk-www-bugs@athena.mit.edu"
DLG:set_entry_value $w 2 "Comments on tkWWW Version $tkW3Version"
pack append $w \
--- 19,25 ----
DLG:toplevel . $w
DLG:draw_entries $w {To: Subject:}
! DLG:set_entry_value $w 1 "tk-www-bugs@mit.edu"
DLG:set_entry_value $w 2 "Comments on tkWWW Version $tkW3Version"
pack append $w \
***************
*** 48,62 ****
}
proc tkW3HelpAddToMailingList {} {
! tkW3OutputSetMessage "Sending request to tk-www-request@athena.mit.edu"
! tkW3ConfigSendMail tk-www-request@athena.mit.edu "Subscribe" "Add to list"
! tkW3OutputSetMessage "Request sent to tk-www-request@athena.mit.edu"
}
proc tkW3HelpRemoveFromMailingList {} {
! tkW3OutputSetMessage "Sending request to tk-www-request@athena.mit.edu"
! tkW3ConfigSendMail tk-www-request@athena.mit.edu "Remove" "Remove from list"
! tkW3OutputSetMessage "Request sent to tk-www-request@athena.mit.edu"
}
proc tkW3HelpGetTopic {topic} {
--- 48,62 ----
}
proc tkW3HelpAddToMailingList {} {
! tkW3OutputSetMessage "Sending request to tk-www-request@mit.edu"
! tkW3ConfigSendMail tk-www-request@mit.edu "Subscribe" "Add to list"
! tkW3OutputSetMessage "Request sent to tk-www-request@mit.edu"
}
proc tkW3HelpRemoveFromMailingList {} {
! tkW3OutputSetMessage "Sending request to tk-www-request@mit.edu"
! tkW3ConfigSendMail tk-www-request@mit.edu "Remove" "Remove from list"
! tkW3OutputSetMessage "Request sent to tk-www-request@mit.edu"
}
proc tkW3HelpGetTopic {topic} {
diff -c WWW/TkWWW/Tcl/hypertext.tcl:1.11 WWW/TkWWW/Tcl/hypertext.tcl:1.12
*** WWW/TkWWW/Tcl/hypertext.tcl:1.11 Mon Dec 13 20:06:38 1993
--- WWW/TkWWW/Tcl/hypertext.tcl Mon Dec 13 20:06:38 1993
***************
*** 146,152 ****
if {$stack == "list" && $tkW3HtText(list.stack) == {}} {
tkW3HtBlankLines 2
- update idletasks
}
}
--- 146,151 ----
diff -c WWW/TkWWW/Tcl/init.tcl:1.2 WWW/TkWWW/Tcl/init.tcl:1.3
*** WWW/TkWWW/Tcl/init.tcl:1.2 Mon Dec 13 20:06:39 1993
--- WWW/TkWWW/Tcl/init.tcl Mon Dec 13 20:06:39 1993
***************
*** 24,29 ****
--- 24,32 ----
catch "set tkW3ConfigFile $env(HOME)/.tkWWW-config"
set tkW3EditChar(translate) {}
+ set tkW3HtPage(base) ""
+ set tkW3HtPage(modified) 0
+ set tkW3HtPage(is_index) 0
set tkW3ConfigHelpRoot http://tk-www.mit.edu:8001/tk-www/help
***************
*** 61,66 ****
--- 64,70 ----
{"Open Link..." {DLG:show . .goto_dialog}}
{"Change directory..." tkW3FileChangeDirectory}
{}
+ {"Save" tkW3FileSave}
{"Save as..." tkW3FileSaveAs 0}
{"Generate Source" tkW3EditGenerate}
{"Save Text..." tkW3FileSaveText}
***************
*** 155,164 ****
{"Starting information sources" "tkW3HelpGetTopic sources" 0}
{}
{"Send mail to developer..." "DLG:show . .send_mail_dialog" 0}
! {"Subscribe to mailing list tk-www@athena.mit.edu" "tkW3HelpAddToMailingList" }
- {"Unsubscribe to mailing list tk-www@athena.mit.edu" "tkW3HelpRemoveFromMailingList" }
-
{}
{"Using Help" "tkW3HelpGetTopic using_help" 6}
{"Product Information" "tkW3HelpAbout" 0}
--- 159,167 ----
{"Starting information sources" "tkW3HelpGetTopic sources" 0}
{}
{"Send mail to developer..." "DLG:show . .send_mail_dialog" 0}
! {"Subscribe to mailing list tk-www@mit.edu" "tkW3HelpAddToMailingList" }
! {"Unsubscribe to mailing list tk-www@mit.edu" "tkW3HelpRemoveFromMailingList" }
{}
{"Using Help" "tkW3HelpGetTopic using_help" 6}
{"Product Information" "tkW3HelpAbout" 0}
***************
*** 175,180 ****
--- 178,185 ----
{find "Find" {DLG:show . .find_dialog}}
{goto "Goto..." {DLG:show . .goto_dialog}}
{reload "Reload" tkW3NavigateReload}
+ {save "Save" tkW3FileSave}
+ {save_as "Save As..." tkW3FileSaveAs}
{generate "Generate Source" {tkW3EditGenerate}}
{clone "Clone" {tkW3NavigateClone [tkW3NavigateGetAddress]}}
{close_window "Close Window" "tkW3FileQueryCloseWindow"}
***************
*** 484,490 ****
bind Text <Control-w> {# xf ignore me 9
catch "%W delete sel.first sel.last"}
bind Text <Control-y> {# xf ignore me 9
! %W insert insert "[tkW3EditGetSelection]"; %W yview -pickplace insert}
bind Text <Home> {# xf ignore me 9
%W mark set insert 1.0; %W yview -pickplace insert}
bind Text <End> {# xf ignore me 9
--- 489,495 ----
bind Text <Control-w> {# xf ignore me 9
catch "%W delete sel.first sel.last"}
bind Text <Control-y> {# xf ignore me 9
! %W insert insert "[tkW3EditSelectionGet]"; %W yview -pickplace insert}
bind Text <Home> {# xf ignore me 9
%W mark set insert 1.0; %W yview -pickplace insert}
bind Text <End> {# xf ignore me 9
***************
*** 530,539 ****
bind Entry <Control-l> {# xf ignore me 9
tk_entrySeeCaret %W}
bind Entry <Control-v> {# xf ignore me 9
! %W insert insert "[tkW3EditGetSelection]"; tk_entrySeeCaret %W}
bind Entry <Control-w> {# xf ignore me 9
catch "%W delete sel.first sel.last"; tk_entrySeeCaret %W}
bind Entry <Control-y> {# xf ignore me 9
! %W insert insert "[tkW3EditGetSelection]"; tk_entrySeeCaret %W}
bind Entry <2> {# xf ignore me 9
! %W insert insert "[tkW3EditGetSelection]"; tk_entrySeeCaret %W}
--- 535,544 ----
bind Entry <Control-l> {# xf ignore me 9
tk_entrySeeCaret %W}
bind Entry <Control-v> {# xf ignore me 9
! %W insert insert "[tkW3EditSelectionGet]"; tk_entrySeeCaret %W}
bind Entry <Control-w> {# xf ignore me 9
catch "%W delete sel.first sel.last"; tk_entrySeeCaret %W}
bind Entry <Control-y> {# xf ignore me 9
! %W insert insert "[tkW3EditSelectionGet]"; tk_entrySeeCaret %W}
bind Entry <2> {# xf ignore me 9
! %W insert insert "[tkW3EditSelectionGet]"; tk_entrySeeCaret %W}
diff -c WWW/TkWWW/Tcl/navigate.tcl:1.25 WWW/TkWWW/Tcl/navigate.tcl:1.26
*** WWW/TkWWW/Tcl/navigate.tcl:1.25 Mon Dec 13 20:06:40 1993
--- WWW/TkWWW/Tcl/navigate.tcl Mon Dec 13 20:06:40 1993
***************
*** 182,188 ****
# Load the page and get the return code
# If the return code contains "Error" signal an error
! if [catch "HtLoad $page_value" return_value] {
# Ooops there's an error
# If it is a "Page Not Found" error create new page
--- 182,188 ----
# Load the page and get the return code
# If the return code contains "Error" signal an error
! if [catch [list HtLoad $page_value] return_value] {
# Ooops there's an error
# If it is a "Page Not Found" error create new page
diff -c WWW/TkWWW/Tcl/output.tcl:1.16 WWW/TkWWW/Tcl/output.tcl:1.17
*** WWW/TkWWW/Tcl/output.tcl:1.16 Mon Dec 13 20:06:40 1993
--- WWW/TkWWW/Tcl/output.tcl Mon Dec 13 20:06:40 1993
***************
*** 198,200 ****
--- 198,204 ----
$w configure -state normal
}
}
+
+ proc tkW3OutputError {message} {
+ DLG:msg . .error_dialog $message error "OK"
+ }
diff -c WWW/TkWWW/Tcl/telnet.tcl:1.5 WWW/TkWWW/Tcl/telnet.tcl:1.6
*** WWW/TkWWW/Tcl/telnet.tcl:1.5 Mon Dec 13 20:06:41 1993
--- WWW/TkWWW/Tcl/telnet.tcl Mon Dec 13 20:06:41 1993
***************
*** 30,37 ****
append body_text "Log in as \"$user\"\n"
}
tkW3OutputSetAddress $page {}
! tkW3NavigatePreface $body_text "Press here to connect" \
! {Connecting...} \
[format "tkW3Telnet \{%s\} \{%s\} \{%s\}" $command $host $port]
}
}
--- 30,36 ----
append body_text "Log in as \"$user\"\n"
}
tkW3OutputSetAddress $page {}
! tkW3NavigatePreface $body_text "telnet connection" \
[format "tkW3Telnet \{%s\} \{%s\} \{%s\}" $command $host $port]
}
}